Update quilt patches.

diff --git a/debian/patches/disable-conflicting-include.patch b/debian/patches/disable-conflicting-include.patch
index 369d5440555a600a9f6efe697a635ae4f32b92d0..571a09aaeb0e4c8357563c318a6bd320962e231a 100644 (file)
--- a/debian/patches/disable-conflicting-include.patch
+++ b/debian/patches/disable-conflicting-include.patch
@@ -3,16 +3,13 @@ Date: Thu, 14 Dec 2023 13:28:26 +0000
 X-Dgit-Generated: 115.3.0esr-1+rpi1 3fa90e359bf40c35d48faccfefd9a136fc0223ff
 Subject: disable conflicting include.
 
-
----
-
 diff --git a/js/src/jit/shared/AtomicOperations-shared-jit.cpp b/js/src/jit/shared/AtomicOperations-shared-jit.cpp
-index df7c049dfac..d580387efdc 100644
+index d0a2f0c887c..fc495f1b6b7 100644
 --- a/js/src/jit/shared/AtomicOperations-shared-jit.cpp
 +++ b/js/src/jit/shared/AtomicOperations-shared-jit.cpp
-@@ -6,9 +6,9 @@
- 
+@@ -18,9 +18,9 @@
  #include "jit/AtomicOperations.h"
+ #include "js/GCAPI.h"
  
 -#if defined(__arm__)
 -#  include "jit/arm/Architecture-arm.h"

diff --git a/debian/patches/disable-jit.patch b/debian/patches/disable-jit.patch
index 0591aefafd93352855df37d14d480c6921ec2366..537fb1c6a11e94fa682f3357b97f788989c8eb4b 100644 (file)
--- a/debian/patches/disable-jit.patch
+++ b/debian/patches/disable-jit.patch
@@ -1,45 +1,32 @@
 From: Peter Michael Green <plugwash@raspbian.org>
 Subject: Disable jit.
 
-
----
-
-Index: firefox-esr-128.11.0esr/js/moz.configure
-===================================================================
---- firefox-esr-128.11.0esr.orig/js/moz.configure
-+++ firefox-esr-128.11.0esr/js/moz.configure
-@@ -251,22 +251,22 @@ def jit_default(
-     enable_portable_baseline_interp,
-     enable_explicit_resource_management,
- ):
--    if enable_record_tuple:
--        return False
+diff --git a/js/moz.configure b/js/moz.configure
+index 7a9506d1fe3..55c3aa53d7d 100644
+--- a/js/moz.configure
++++ b/js/moz.configure
+@@ -237,17 +237,17 @@ set_config(
+ # =======================================================
+ @depends(target, "--enable-portable-baseline-interp")
+ def jit_default(target, enable_portable_baseline_interp):
 -    if enable_portable_baseline_interp:
 -        return False
--    if enable_explicit_resource_management:
--        return False
 -    if target.cpu in (
 -        "x86",
 -        "x86_64",
 -        "arm",
 -        "aarch64",
--        "mips32",
 -        "mips64",
 -        "loongarch64",
 -    ):
 -        return True
-+    #if enable_record_tuple:
-+    #    return False
 +    #if enable_portable_baseline_interp:
 +    #    return False
-+    #if enable_explicit_resource_management:
-+    #    return False
 +    #if target.cpu in (
 +    #    "x86",
 +    #    "x86_64",
 +    #    "arm",
 +    #    "aarch64",
-+    #    "mips32",
 +    #    "mips64",
 +    #    "loongarch64",
 +    #):
@@ -47,16 +34,16 @@ Index: firefox-esr-128.11.0esr/js/moz.configure
      return False
  
  
-Index: firefox-esr-128.11.0esr/js/src/jit/shared/AtomicOperations-shared-jit.cpp
-===================================================================
---- firefox-esr-128.11.0esr.orig/js/src/jit/shared/AtomicOperations-shared-jit.cpp
-+++ firefox-esr-128.11.0esr/js/src/jit/shared/AtomicOperations-shared-jit.cpp
-@@ -55,7 +55,8 @@ static bool UnalignedAccessesAreOK() {
+diff --git a/js/src/jit/shared/AtomicOperations-shared-jit.cpp b/js/src/jit/shared/AtomicOperations-shared-jit.cpp
+index d0a2f0c887c..fc495f1b6b7 100644
+--- a/js/src/jit/shared/AtomicOperations-shared-jit.cpp
++++ b/js/src/jit/shared/AtomicOperations-shared-jit.cpp
+@@ -63,7 +63,8 @@ static bool UnalignedAccessesAreOK() {
  #  if defined(__x86_64__) || defined(__i386__)
    return true;
  #  elif defined(__arm__)
--  return !HasAlignmentFault();
-+  //return !HasAlignmentFault();
+-  return !ARMFlags::HasAlignmentFault();
++  //return !ARMFlags::HasAlignmentFault();
 +  return false;
  #  elif defined(__aarch64__)
    // This is not necessarily true but it's the best guess right now.

diff --git a/debian/patches/disable-more-armv7neon-stuff.patch b/debian/patches/disable-more-armv7neon-stuff.patch
index e59efe3323b6882a2e3edb97cc95733ea6a7c92d..57d9214408efa0c22d11a6342242daff64739bee 100644 (file)
--- a/debian/patches/disable-more-armv7neon-stuff.patch
+++ b/debian/patches/disable-more-armv7neon-stuff.patch
@@ -55,10 +55,10 @@ index eb5b22c0542..52b70b46d21 100644
      EXPORTS.aom += files['ARM64_EXPORTS']
      ASFLAGS += [
 diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
-index bbf76dee8e1..1bd6308910f 100644
+index ed66596a520..11258e19da2 100644
 --- a/media/libaom/sources.mozbuild
 +++ b/media/libaom/sources.mozbuild
-@@ -1,276 +1,6 @@
+@@ -1,291 +1,6 @@
  # This file is generated. Do not edit.
  
  files = {
@@ -78,7 +78,6 @@ index bbf76dee8e1..1bd6308910f 100644
 -    '../../third_party/aom/aom_ports/bitops.h',
 -    '../../third_party/aom/aom_ports/mem.h',
 -    '../../third_party/aom/aom_ports/sanitizer.h',
--    '../../third_party/aom/aom_scale/aom_scale.h',
 -    '../../third_party/aom/aom_scale/yv12config.h',
 -  ],
 -  'ARM_SOURCES': [
@@ -91,6 +90,7 @@ index bbf76dee8e1..1bd6308910f 100644
 -    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
 -    '../../third_party/aom/aom_dsp/arm/aom_convolve8_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/aom_convolve_copy_neon.c',
+-    '../../third_party/aom/aom_dsp/arm/aom_scaled_convolve8_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/avg_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/avg_pred_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c',
@@ -117,7 +117,6 @@ index bbf76dee8e1..1bd6308910f 100644
 -    '../../third_party/aom/aom_dsp/arm/highbd_variance_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/intrapred_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/loopfilter_neon.c',
--    '../../third_party/aom/aom_dsp/arm/masked_sad4d_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/masked_sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/obmc_sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/obmc_variance_neon.c',
@@ -169,8 +168,6 @@ index bbf76dee8e1..1bd6308910f 100644
 -    '../../third_party/aom/aom_mem/aom_mem.c',
 -    '../../third_party/aom/aom_ports/aarch32_cpudetect.c',
 -    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
--    '../../third_party/aom/aom_scale/generic/aom_scale.c',
--    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
 -    '../../third_party/aom/aom_scale/generic/yv12config.c',
 -    '../../third_party/aom/aom_scale/generic/yv12extend.c',
 -    '../../third_party/aom/aom_util/aom_thread.c',
@@ -178,6 +175,7 @@ index bbf76dee8e1..1bd6308910f 100644
 -    '../../third_party/aom/av1/av1_cx_iface.c',
 -    '../../third_party/aom/av1/av1_dx_iface.c',
 -    '../../third_party/aom/av1/common/alloccommon.c',
+-    '../../third_party/aom/av1/common/arm/av1_convolve_horiz_rs_neon.c',
 -    '../../third_party/aom/av1/common/arm/av1_convolve_scale_neon.c',
 -    '../../third_party/aom/av1/common/arm/av1_inv_txfm_neon.c',
 -    '../../third_party/aom/av1/common/arm/av1_txfm_neon.c',
@@ -318,7 +316,6 @@ index bbf76dee8e1..1bd6308910f 100644
 -    '../../third_party/aom/av1/encoder/superres_scale.c',
 -    '../../third_party/aom/av1/encoder/svc_layercontext.c',
 -    '../../third_party/aom/av1/encoder/temporal_filter.c',
--    '../../third_party/aom/av1/encoder/thirdpass.c',
 -    '../../third_party/aom/av1/encoder/tokenize.c',
 -    '../../third_party/aom/av1/encoder/tpl_model.c',
 -    '../../third_party/aom/av1/encoder/tx_search.c',
@@ -332,14 +329,32 @@ index bbf76dee8e1..1bd6308910f 100644
 -    '../../third_party/aom/third_party/fastfeat/nonmax.c',
 -    '../../third_party/aom/third_party/vector/vector.c',
 -  ],
-   'ARM64_EXPORTS': [
-     '../../third_party/aom/aom/aom.h',
-     '../../third_party/aom/aom/aom_codec.h',
+-  'ARM64_EXPORTS': [
+-    '../../third_party/aom/aom/aom.h',
+-    '../../third_party/aom/aom/aom_codec.h',
+-    '../../third_party/aom/aom/aom_decoder.h',
+-    '../../third_party/aom/aom/aom_encoder.h',
+-    '../../third_party/aom/aom/aom_external_partition.h',
+-    '../../third_party/aom/aom/aom_frame_buffer.h',
+-    '../../third_party/aom/aom/aom_image.h',
+-    '../../third_party/aom/aom/aom_integer.h',
+-    '../../third_party/aom/aom/aomcx.h',
+-    '../../third_party/aom/aom/aomdx.h',
+-    '../../third_party/aom/aom_mem/aom_mem.h',
+-    '../../third_party/aom/aom_ports/aom_timer.h',
+-    '../../third_party/aom/aom_ports/bitops.h',
+-    '../../third_party/aom/aom_ports/mem.h',
+-    '../../third_party/aom/aom_ports/sanitizer.h',
+-    '../../third_party/aom/aom_scale/yv12config.h',
+-  ],
+   'ARM64_SOURCES': [
+     '../../third_party/aom/aom/src/aom_codec.c',
+     '../../third_party/aom/aom/src/aom_decoder.c',
 diff --git a/media/libvpx/sources.mozbuild b/media/libvpx/sources.mozbuild
-index 12c20ede9f3..77fd770abfe 100644
+index c2565c6d15b..298209f55e4 100644
 --- a/media/libvpx/sources.mozbuild
 +++ b/media/libvpx/sources.mozbuild
-@@ -1647,257 +1647,6 @@ files = {
+@@ -1659,257 +1659,6 @@ files = {
      'libvpx/vpx_scale/vpx_scale_rtcd.c',
      'libvpx/vpx_util/vpx_thread.c',
      'libvpx/vpx_util/vpx_write_yuv_frame.c',
@@ -622,31 +637,27 @@ index 7d2d694722e..6e879571ed0 100644
  
  // Currently we only have CPU detection for Linux via /proc/cpuinfo
 diff --git a/third_party/aom/aom_dsp/aom_dsp.cmake b/third_party/aom/aom_dsp/aom_dsp.cmake
-index 6d8e5a961b5..aaa73e20232 100644
+index 9ceb10990d0..58b609815b8 100644
 --- a/third_party/aom/aom_dsp/aom_dsp.cmake
 +++ b/third_party/aom/aom_dsp/aom_dsp.cmake
-@@ -106,15 +106,15 @@ list(APPEND AOM_DSP_COMMON_INTRIN_AVX2
-             "${AOM_ROOT}/third_party/SVT-AV1/EbMemory_SSE4_1.h"
-             "${AOM_ROOT}/third_party/SVT-AV1/synonyms.h")
+@@ -106,13 +106,13 @@ if(CONFIG_SVT_AV1)
+               "${AOM_ROOT}/third_party/SVT-AV1/synonyms.h")
+ endif()
  
 -list(APPEND AOM_DSP_COMMON_INTRIN_NEON
 -            "${AOM_ROOT}/aom_dsp/arm/aom_convolve_copy_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon.c"
--            "${AOM_ROOT}/aom_dsp/arm/fwd_txfm_neon.c"
+-            "${AOM_ROOT}/aom_dsp/arm/aom_scaled_convolve8_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/loopfilter_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/intrapred_neon.c"
--            "${AOM_ROOT}/aom_dsp/arm/subtract_neon.c"
--            "${AOM_ROOT}/aom_dsp/arm/blend_a64_mask_neon.c"
--            "${AOM_ROOT}/aom_dsp/arm/avg_pred_neon.c")
+-            "${AOM_ROOT}/aom_dsp/arm/blend_a64_mask_neon.c")
 +#list(APPEND AOM_DSP_COMMON_INTRIN_NEON
 +#            "${AOM_ROOT}/aom_dsp/arm/aom_convolve_copy_neon.c"
 +#            "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon.c"
-+#            "${AOM_ROOT}/aom_dsp/arm/fwd_txfm_neon.c"
++#            "${AOM_ROOT}/aom_dsp/arm/aom_scaled_convolve8_neon.c"
 +#            "${AOM_ROOT}/aom_dsp/arm/loopfilter_neon.c"
 +#            "${AOM_ROOT}/aom_dsp/arm/intrapred_neon.c"
-+#            "${AOM_ROOT}/aom_dsp/arm/subtract_neon.c"
-+#            "${AOM_ROOT}/aom_dsp/arm/blend_a64_mask_neon.c"
-+#            "${AOM_ROOT}/aom_dsp/arm/avg_pred_neon.c")
++#            "${AOM_ROOT}/aom_dsp/arm/blend_a64_mask_neon.c")
  
  list(APPEND AOM_DSP_COMMON_INTRIN_NEON_DOTPROD
-             "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon_dotprod.c")
+             "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon_dotprod.c"